bitkeeper revision 1.1558 (4294f9a2Vif6PUYZMV6j1GuP-Mn6Xg)

gcc4 build fixes.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c
index 06f8c15a96ec8e4ce16613ab5f4ff91b1503b5b6..1d42756dc1333909a90bc7a2cb0ed2a8cd114e12 100644 (file)
--- a/xen/arch/x86/dmi_scan.c
+++ b/xen/arch/x86/dmi_scan.c
@@ -9,7 +9,7 @@
 #include <asm/system.h>
 #include <xen/dmi.h>
 
-#define bt_ioremap(b,l)  __acpi_map_table(b,l)
+#define bt_ioremap(b,l)  ((u8 *)__acpi_map_table(b,l))
 #define bt_iounmap(b,l)  ((void)0)
 #define ioremap(b,l)     (__va(b))
 #define memcpy_fromio    memcpy
@@ -34,7 +34,7 @@ struct dmi_header
 
 static char * __init dmi_string(struct dmi_header *dm, u8 s)
 {
-       u8 *bp=(u8 *)dm;
+       char *bp=(char *)dm;
        bp+=dm->length;
        if(!s)
                return "";

diff --git a/xen/arch/x86/genapic/es7000plat.c b/xen/arch/x86/genapic/es7000plat.c
index 58cc0bf610a5b63a5603a39579f2b81e15e7561a..8bf571bd273ea97a9744635c6c1117a37e816c7d 100644 (file)
--- a/xen/arch/x86/genapic/es7000plat.c
+++ b/xen/arch/x86/genapic/es7000plat.c
@@ -149,7 +149,7 @@ find_unisys_acpi_oem_table(unsigned long *oem_addr, int *length)
        unsigned long                   rsdp_phys = 0;
        struct acpi_table_header        *header = NULL;
        int                             i;
-       struct acpi_table_sdt           sdt;
+       struct acpi_table_sdt           sdt = { 0 };
 
        rsdp_phys = acpi_find_rsdp();
        rsdp = __va(rsdp_phys);